Merge pull request #7 from gphat/master

Minor nits and a warning fix.
Merge pull request #8 from gphat/master

Use Option in MoeObject
Merge remote-tracking branch 'upstream/master'