Deal with multi-paragraph definitions a little more gracefully
Add tests
PEP8