Merge pull request #83 from BalazsJako/dev

Merging to master