Update to master

Merge pull request #49 from ArchieT/master