patch for issue #1
Merge branch 'release/1.3.1' into dev