Update decorators
Merge pull request #13 from nacyot/master

Update decorators