Merge branch 'master' of github.com:tophj/enigma