API refactoring
API refactoring
Merge pull request #73 from sumerjabri/master

API refactoring