you could merge Jason's PR and help test. :)