Move before action and after action logic into Controller; fixes #10; bumb version