zummenix Merge pull request #24 from zummenix/patch_23 …