Added fix for standards
Merge pull request #514 from parthibane/master

Added fix for standards- DO-5299