Merge pull request #232 from justincc/159271bfbe2202e1a4b23b7607be60d408f86e40