keller-mark Merge pull request #4 from sehilyi/patch-1