tentative fix for issue #310
fix test failure
fix docstring and remove commented out code
Merge pull request #364 from diogomatsubara/issue-#310-formatting-destroyed

Issue #310 formatting destroyed