Feature/v0.4.0