Quick space fixes
Merge pull request #13 from alexpaley/development

Quick space fixes