update PROMPT
fix setup script
Merge branch 'master' into my-mba