Prepare for next dev iteration
Merge pull request #41 from andylyall/develop

Prepare for next dev iteration