Removed comments
External decorators
Merge branch 'feature/external_decorators' into develop