Merge pull request #56 from ArchieT/master

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

Update to master