Next version
WIP
Merge pull request #6 from GrahamCampbell/develop

Develop