Work on documentation complete, ready to merge