removed extra spaces
Merge with master