Tweaking sentence splitting and generation
Merge from master