merged samolsen pull request