Merge branch 'master' of github.com:DeegC/zeidon-joe into 1.0.6
Merge branch '1.0.6' of github.com:DeegC/zeidon-joe into 1.0.6