Restores Feature #587
Removes unnecessary spacing
Merge pull request #1090 from Polarbear541/feature-587

Restore Feature #587