Small changes to headers and documentation
Fixed merge conflict