Merge pull request #64 from RichLewis007/master