Bug Fix: added new line tags to avoid breaking on hyphen.
Merge branch 'master' into gh-pages