fixed #59; code refactoring
fixed #59; code refactoring

akdor1154/kwm,cHoco/kwm,akdor1154/kwm,cHoco/kwm,akdor1154/kwm,cHoco/kwm,koekeishiya/kwm,koekeishiya/kwm,koekeishiya/kwm,a-morales/kwm,a-morales/kwm,a-morales/kwm