Merge pull request #100 from mottosso/api

API
Implements #85