Release/0.0.3 cont