Jean85 Merge pull request #45 from erikn69/patch-1