Merge pull request #1 from undergroundtheater/master

Update to latest Codebase
Merge pull request #37 from gameheart/master

Merge pull request #1 from undergroundtheater/master