Pull Request 2 Dev 1.1

please convert L30 ~ L37 to switch() statement instead