api documnetation
Merge branch 'minor_changes' into development