Added check to remove any troublesome spaces.
Closes #210
Merge remote-tracking branch 'origin/development' into development