Merge pull request #2 from rgknox/master

Fixes from Odyssey transition
Merge remote-tracking branch 'upstream/master'