almost there
Merge pull request #9 from rphitt1/master

almost there