Feature/prep for release