Merge branch 'hotfix/0.3.2'
Merge branch 'release/0.3.3'
Merge branch 'release/0.3.4'
Merge branch 'release/0.3.5'
Fixed funny or die pattern
[package.json] update version to 0.3.6
Merge branch 'hotfix/0.3.6' into develop