mehcode Merge pull request #63 from filalex77/patch-1