PR for dev_1.0

Please fix indentation.