Bug fix
Merge pull request #44 from bnormoyle/2.2.0.2-stability

Bug fix