Merge branch 'release-0.3.1'
Fixer dir calculation for root in update.sh
Version bumped from  0.3.1 to 0.3.2
Merge branch 'release-0.3.2'