Added finger detection
merge