rokuwaki Merge pull request #1 from katrinleinweber/patch-1