Merge pull request #49 from ArchieT/master

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

Merge pull request #49 from ArchieT/master