Merge pull request #58 from ArchieT/master

Update to master