Wrapped docs at 80 chars
Completed changes as suggested in the original pull request