[Add] Branch 0.3.6