merge from Newfeature danio2 to master

danio2 add new features