Feature/merge 0.9.0