Merge pull request #7 from NZX/develop

Push commits upstream into Jacks' repository
Merge remote-tracking branch 'upstream/develop' into develop