ticket:3 fixing according to comments
Merge branch 't3_middleware'