Issue #131 - update API
Issue #131 - update API