Bug fix + branding 0.1.1