sdassow Merge pull request #12 from lemnis/patch-1