wrapped h3 and switch
Merge pull request #449 from ar4s/fix/switch-mode

Wrapped h3 and switch