Reworked api to be consistant and stable.
Merge branch 'master' of github.com:TeamFauna/dumbo