Fixed some rookie Java mistakes and allowed for words with spaces and apostrophes.
Merge remote-tracking branch 'origin/master'