task #00027-Switchs_module: Feature added
Merge branch '00027-Switchs_module' into develop