incorporated the comments
Merge branch '1214' of https://github.com/gauravgopi123/Malhar into dt-dev