Working on dealing with whitespace issues.
Merge branch 'master' into book