Rectified compilation issues.
Merge pull request #1039 from shivalinga/dev-branch

Rectified compilation issues.