Renamed
Merge pull request #1 from emilthidell/dev

Merging to master