Changed as my own requirement.
Fix for c++11
Fix merge issue