prevent short titles from ending in an underscore. fixes #126
Merge remote-tracking branch 'origin/master'