unittest
Merge branch 'api' into test
whitespace cleanup
utests
bugfix
bugfix
conflict
bugfix
Merge branch 'master' into test
test,bugfix
use whitespace
use whitespace
Merge pull request #4 from snowleung/master

bugfix