added switch cases @imaginek12.com
Merge branch 'dev_tim'