merge from 3.0 for fix some bug.
remove about std::funciton support
Merge pull request #48 from Dhilan007/master

merge from 3.0 for fix some bug.