gmazzap Merge pull request #23 from szepeviktor/patch-2