Canary

Added the feature listed in the issue #13 to do a more generic detection.