Added history expansion
Merge pull request #18 from Wouter92/master

Added history expansion: good work! 
I'll commit the fixes above in a minute...