heran's changes
Merge branch 'master' of http://github.com/IronTurtle/UntetheredRunning