Conflicting code...
Merge branch 'master' of https://github.com/ajwerner/safe
Fixes