Merge pull request #2 from mrgokul/master

updating with master