2.1.4

For Issue #65
Merge branch 'release/2.1.4' into develop