Feature/0.4.0