Whitespace & PEP8 gardening.
Add remainder of note
Add test and fix for issue #247
Merge remote-tracking branch 'origin/master'