Merge pull request #356 from SvenRoederer/patch-1