Bug fixes + branding 1.0.2