Merge pull request #267 from ebbyw/Ebby

Ebby
Merge branch 'master' into Ebby