Merge pull request #6 from eddy5641/master

merge