Removed conflicts to stop unexpected behaviour
Merge pull request #24 from mikemead/master

Removed conflicts to stop unexpected behaviour