Merge pull request #1 from siad007/master

Master
Fixed comments and updated api doc
Fixed comments and updated api doc