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