tj2 commit
Merge pull request #2 from staranjeet/master

tj2 commit