Update to 1.0.2
Merge branch 'master' into prefs