Merge pull request #37 from DavidMMelin/master

Renamed shit