Added update.sh; minor fixes.
Merge branch 'develop'