Feature/0.2.0