latest code updates
Merge pull request #1 from vikmenon/master

latest code updates