Feature/0.5.0