New branch 0.3.1