revise api
Merge pull request #2 from yanak/fix/revise-api

Revise API