Added auto-detect
Merge branch 'master' of https://github.com/d4rkcat/HandShaker