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