trying to add detection...
Merged with master