Fixed an extra character floating around
Merge branch 'master' into kingman