Updated API documentation
Merged changes