Merge remote-tracking branch 'upstream/master' into HEAD
Merge pull request #9 from Lexicality/dr_history

Restore pull req #8's history
Merge remote-tracking branch 'upstream/master'