api fixes
Merge pull request #42 from BrandyMint/heretge/develop

api fixes