merges pull request from @bigmouth;