Merge pull request #68 from vanjikumaran/master

Added improvement for MP and corrected the ESBJAVA-3047