General enhancements.
Merge pull request #1 from gredman/master

General enhancements.