Merge pull request #136 from avinashcpandey/develop

Some code cleanup
Fixed EPR#391728