Merge pull request #7 from DavidTanner/merge-test

Merged
Merge branch 'merge-test'
Merge 2adb003de2e661f3e302c38aef0b086aea23e308 into ffe3af225fd232e486a4c3792c1ef17477c4dabc
Bumping version