merging dmitlers pull request