Merge pull request #58 from ArchieT/master

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

Merge pull request #58 from ArchieT/master