Merge pull request #103 from rrthomas/master

Fix some minor issues