added functionality to terminations #370
Merge branch 'release/v2.0.4' into develop