A few minor bug fixes.
Merge pull request #11 from mdandrea/master

A few minor bug fixes.