Fixes issue #25

Will conflict if merged after branch 'punctuation'