more obvious logic for application controller
Merge pull request #1393 from mikspark/application-controller

more obvious logic for application controller