Release/0.3.6