Going with standard detection method.
Merge branch 'master' of github.com:mikeal/broquire