Merge pull request #77 from leppa/master

Few fixes and improvements