Merge pull request #35 from mstetson/master

Fix #33 and #34