stephentu v matt
Fix merge conflict
Merge pull request #25 from stephen-turner/master

stephentu v matt