Merge pull request #37 from Hasimir/master

Multiple changes