Lots of changes to get full code coverage
Merge branch 'master' of github.com:Ongion/betrayal