Feature/guard controller multiple actions

Rebased/cleaned/squashed version of #143