Merge pull request #57 from deomitrus/master

Update dev branch from master
Merge pull request #58 from deomitrus/dev

Merge pull request #57 from deomitrus/master