Resolve Issue 6
Merge pull request #8 from james-dibble/issue6

Resolve Issue 6