Fixes #213.
Merge branch 'master' of https://github.com/cfwheels/cfwheels
Refactored syntax.
Merge branch 'master' of https://github.com/cfwheels/cfwheels