Fix for #603
Merge pull request #604 from Acans/release-2.1

Fix for #603