Fix #106

Open
flecomte wants to merge 2 commits from fix into master