Merge pull request #308 from Elffers/master

Change dependency of rdoc task
Add #307, #308 to History