Minor style changes
Infinite loop when first word is longer than line
Merge remote-tracking branch 'upstream/master'
Merge branch 'infinite-loop'