Merge pull request #4 from SyncFree/api_mods

Api mods
Merge branch 'master' into failure