Merge pull request #52 from ArchieT/master

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

Merge pull request #52 from ArchieT/master