Feature/0.9.6