Modified API
Merge pull request #31 from gideonaireX/master

Modified API