billhollings Merge pull request #227 from billhollings/master …