Test
Merge pull request #8 from DavidTanner/merge-test

Merged