Merge tag '1.3.1' into develop

1.3.1
Merge branch 'master' into develop
Fix for #53
1.3.2
Merge branch 'release/1.3.2'