Include redheadedrod's latest changes
Merge pull request #30 from geekwright/master

Include redheadedrod's latest changes