update setup
update setup
Merge pull request #81 from raviosc/developer104

update setup