Better handling of whitespace.
Bumped version number. Updated readme.
Merge branch 'release/1.0.5'