Almost done
Merge pull request #8 from davidjwk/patch-8

Almost done