added dynamic authorship support
Merge branch '1.3.5'