Minor code fixes
Minor code fix
Merge pull request #4 from lurch/patch-2

Minor code fixes