Merge remote-tracking branch 'origin/leo' : fixes #20