updated code
Merge pull request #12 from Dhiru/master

updated code