Improve generic machine
Merge branch 'master' of github.com:jeremt/emotionDetector