cute-jumper Merge pull request #7 from ljos/patch-1