Updates for zeidon-test
Merge branch '1.0.6' of https://github.com/DeegC/zeidon-joe into 1.0.6
Merge origin/1.0.6 into 1.0.6