Add option to choose switch

Fix for package
Merge branch 'ask-switch' into develop