Merge pull request #1 from vobe/master

Couple of fixes and improvements