Merge pull request #54 from aidanoleary/master

HUD working
Commit.
Commit -a
pull from upstream