add more test
finalizing cs + imports + etc...
apidoc return value patch
Merge pull request #2 from bushbaby/develop

Develop