Version 0.9 beta3
All credits to zanezam

Change-Id: I9ebcd41b0cd98665febb347af680ff418fc81b6a