Backported #85 in 2.1 branch
Merge pull request #100 from phansys/v2.1

Backported #85 in 2.1 branch