Merge pull request #89 from dejan-brkic/master

Fix minor bugs