Merged pull request from @whitneyit and @fisch0920