the api work... begins
Merge branch 'master' into api
more api tweaks
Merge pull request #15 from f4nt/api

Api