refs #85 try to reproduce issue
Merge branch 'master' into issue-85
import from @yvladimirov
closes #85
Merge pull request #86 from twillouer/issue-85

Issue 85