Restore change from 01f8f79 lost in 23dc0af6
Merge pull request #158 from mikeubell/master

Restore change from 01f8f79 lost in 23dc0af6