Clean and merge the pull request sent from ajithv master repo