Merge pull request #8 from tomwayson/master

merged