PR for dev_1.0

Please fix indentation of the cases under this switch loop.