rebase modifications
Merge pull request #1 from shaon/master

rebase modifications