Fixed issue with merges failing due to needing to edit merge message
Bumped version
Merge pull request #1 from jamgregory/master

Fixing issue when merging from master to demo