added author
Merge branch 'hotfix/add-author'
Merge tag 'add-author' into develop

v0.36