Merge branch 'r/0.3' into develop
Add author heading to table footer
Merge branch 'develop'