Merge pull request #1 from ebbyw/master

merge