Resolve

I think this resolve the issue #41, an keep the api