Merge branch 'release/v2.1.1' into develop
Merge branch 'hotfix/headings2' into develop
cleaned up defaults
bumped up version to v2.1.3
Merge branch 'release/v2.1.3'