How about some detection sexiness?
Merged changes from master