Merge pull request #2 from sadilek/master

some small fixes to make it work