Merge branch 'master' into develop
sweet!
new shell functions in setup.sh
Merge pull request #2 from ggonza89/develop

Develop