Cleaned up code a bit.
Merge branch 'master' of https://github.com/dchavezlive/Dungeon-of-Doom