ligi Merge pull request #11 from TimDaub/patch-2