Update setup

second time in remote from 87
Merge pull request #1 from sandeep87/master

from sandeep87
Merge pull request #2 from sandeepsharma1/master

from sandeep87