Merge branch 'release/0.5.0' into develop
Merge remote-tracking branch 'origin/develop' into fix_macosx_error