Better API doc
Merge pull request #19 from pikesley/refactor

Better API doc