Finish api
Merge pull request #10 from DevelopmentPractice201405/api

Finish api