Possible fix for HistoryView, needs more work
Merge branch 'master' of https://github.com/andoh/the-4-horsemen.git