Merge pull request #38 from ArchieT/master

Update to master