Work on documentation
Fix merge