Added 'onespace' option