Partital implementaion of api
Fixed bug
Compeleted API function
Merge branch 'AddingAPIFunction'