Merge pull request #530 from ovatsus/master

Fix for #350
Release 2.0.3