update decorators
Merge branch 'release/v0.3.3' into develop