added 'switch' for request type
Merge branch 'master' of github.com:straemer/PowerGrid