Added by Brian O'Connor almost 8 years ago
Merge pull request #171 from vitalivanov/dev
Cleanup and cosmetic changes.