Merge pull request #49 from ArchieT/master

Update to master