version 0.9
Merge remote-tracking branch 'origin/master' into android