From Development branch 1.0.1