Merge pull request #1 from amitjain1982/master

get latest code