Merge pull request #18 from jeddenlea/master

Misc fixes.