Merge branch 'hotfix/v1.0.1'
GNR-3 bugfix, changedmodule name in libs
Merge branch 'hotfix/v1.0.2' into develop