Merge pull request #2 from ewu4/master

merge1