Version up to 0.3.6