Deal with multi-paragraph definitions a little more gracefully
Add tests
PEP8
Merge pull request #605 from khandelwal/master

Multi-paragraph definitions