Update conf
Merge branch '0.1' into 0.2