Removed bad whitespace
Merged changes