mergetest
Merge pull request #4 from barrypevans/master

mergetest