Merge pull request # from eddy5641/master

1