Merge pull request #28 from Mrzy/switch

change: insert switch