Simplified API
Updated README and tests