add documentation and merge