Merge pull request #123 from SenseiKiwi/master

Merged in Mazes and Nether Branches
Merge pull request #124 from SenseiKiwi/master

Various Fixes