Merge pull request #225 from fabienrohrer/master

Added speach contribution from David
Merge pull request #226 from fabienrohrer/master

Simplified code
Merge remote-tracking branch 'upstream/master'