api map changes
Merge pull request #163 from extremezoo/Everett's-branch(6/5/14)

api map changes