wilkie Merge pull request #3 from fnha2000/master …