Fixes to issues due to a bad rebase
Merge pull request #173 from jsight/fix_rebase_mistake

Fixes to issues due to a bad rebase