convert to unified API
Merge pull request #9 from ololabs/unified

Convert to unified API