Merge pull request #418 from tobiasd/20170707-es