Merging Robs branch with changes from DRiley/removing spaces -JEuvin