2f4a76 Merge branch 'master' into 'master'

Merged and Committed by Luc Didry 6 years ago
    Merge branch 'master' into 'master'
    
    Fixes #95
    
    Closes #95
    
    See merge request !15