Changes based on pull request review
Merge pull request #4 from vidaha/vida/pr_changes

Changes based on pull request review