Merge pull request #33 from ropalka/1.1

A couple of fixes