fix setup script for clean installation
Merge branch 'develop' of github.com:sdayu/pumbaa into develop