Merge pull request #4 from donmahallem/Api

Api
Merge pull request #5 from donmahallem/Api

ApiStuff
Merge branch 'Api'
Merge pull request #6 from donmahallem/master

Update Api Branch