merged changes from master

merging changes from PR #97 (fix for #96) into v1.1.x