Release/0.0.8-cont