New API
Merge pull request #79 from kevva/new

New API