Wrote a more complete API
Merge pull request #2 from micky2be/master

Wrote a more complete API