Fix for #474
Failing unit test
Rework logic to not require the "action" keyword
Merge pull request #475 from git-tfs/issue_474

Fixes #474