Some patches
Merge branch 'master' of github.com:mrstocks/secret-ninja