Merge pull request #665 from andreas-auerswald/master