Merge pull request #17 from spencerolson/master

Merge pull request #16 from spencerolson/bontgoy