Merge pull request #531 from tobiasd/20180210-blockem