Merge pull request #57 from deomitrus/master

Update dev branch from master