Emphasis additions and fixes
Merge pull request #173 from jamesthorne/master

Emphasis additions and fixes