Merge branch 'fix_issue_25_dash_bad_trap' into travis