Fix #65
Merge branch 'master' into issue5