Merge branch 'release/0.1.4'
Fixed implementation of decorator
Merge branch 'hotfix/fix_decorator' into develop