Reforked updated with changes
Merge pull request #21 from ashjolliffe/master

New pull request to help with merging.