Merge branch 'feature/milestone-3.8.0' into dev
Release 3.8.1: Fixed issue #65
Merge branch 'release/3.8.1'