Merge branch 'hotfix/listener-simplification'
Ignore */* matches.
Split check to own variable assignment.
Merge pull request #65 from spiffyjr/pr/api-listener

Ignore */* matches.
Merge branch 'hotfix/65' into develop

Forward port #65