ashnazg Merge pull request #7 from ralflang/patch-1