meyerweb Merge pull request #5 from waldyrious/patch-1