Merge pull request #31 from ropalka/master

A couple of fixes