new feature added by danio2
sync with master
Merge pull request #4 from daniozhu/newfeature_danio2

merge from Newfeature danio2 to master