Magic history implemented
Merge branch 'master' of https://github.com/guts2014/going-25-in-20-zone