Merge pull request #20 from ehkropf/master

A couple of small fixes.