Fix several hypen-use-as-minus-sign issues

Apply patch from issue #15