Merge branch 'hotfix-6.0.1'
Added a failing test for #12
Fixed #12
Merge remote-tracking branch 'origin/hotfix-6.0.2' into develop