Merge pull request #52 from ArchieT/master

Update to master