Merge pull request #12 from joeybloggs/issue-#9

Issue #9