Bug fixes from Gemini
Merge branch 'master' of https://github.com/robertsoniv/Redemption