bug fixes & test
add test
more tasks for grnut
Merge pull request #8 from lulurun/develop

Develop