Added more accurate documentation.
Merge branch 'develop'
Merge branch 'master' of http://github.com/laserswald/todoc