finished merging samolsen pull request