Added a bit more documentation
Resolved conflicts in changes from Ward and Freek
Merge pull request #13 from FreekDB/master

Handle old commits that have been merged manually