Merge pull request #150 from Tucos/autospace