Merge pull request #73 from sumerjabri/master

API refactoring
Merge pull request #74 from sumerjabri/master

More API refectoring
API refactoring.