Merge pull request #4 from kimsyversen/master

Integrate branch
Merge pull request #5 from kimsyversen/new-decorator

Merge pull request #4 from kimsyversen/master