fixes subissue of #37
Merge branch 'master' into build
build build build build