Update development from Master 1.0.0