Support add/remove API
Merge pull request #3 from evansolomon/add-remove

Support add/remove API