rename
rename
rename
rename
Merge pull request #24 from simontcousins/Issue-11

Issue 11: rename
Merge pull request #25 from simontcousins/develop

Develop: rename