Update history
Merge pull request #145 from shepmaster/history

Update history