Merge pull request #38 from ArchieT/master

Update to master
Merge pull request #44 from ArchieT/pastanalyzing

Merge pull request #38 from ArchieT/master