Specify suffix to remove. Ref #200
Merge branch 'master' into ahbuilder