Feature/package 0.9.x