adam-bec Merge pull request #1 from jakobschoepe/patch-2