Changed some methods to static
Merge branch 'master' of github.com:cgnicholls/enigma