-Another fix to the selector - apologies for spammy commits, I need to use dev as a live test bed.
Merge pull request #619 from mmcguinn/master

-Another fix to the selector - apologies for spammy commits, I need to u...