Merge pull request #3 from sripri/master

Masterr Dev
Feature 1237 commit