Merging changes from master into alphDetection