Another edit.
Merge pull request #2 from kit0/conflicting_edit

Another edit.