Merge pull request #675 from Quix0r/buglink/fixes-curly-spaces