Merge pull request #11 from johnb30/master

Switching to Goose
Fixing some bugs.
Merge remote-tracking branch 'upstream/master'
Syncing upstream changes