Trying to be more consistent with bold face and package names.
Merge branch 'hotfix-issue6'