Fix #1194
Merge remote-tracking branch 'upstream/master'
Add check button for #1188
Merge pull request #1201 from emmanuel-keller/master

Bug fix and improvement