package refactoring.
Merge branch 'master' of github.com:mrn/switch