Method moved to other library
Shorter text field for sentences
Merge remote branch 'upstream/master'