0.6.1 fix for require
Merge branch 'hotfix/0.6.1'
Merge tag '0.6.1' into develop

0.6.1