working on API documentation
Merge