Merge pull request #73 from TekHus/moved-stuff

Moved stuff
Merge pull request #537 from KevWright/master

Moved stuff