Merge pull request #6 from ebbyw/Ebby

Ebby
Merge branch 'Ebby'
Merge branch 'Ebby'
Merge branch 'Ebby'
Merge branch 'Ebby'
Merge branch 'Ebby'
Merge branch 'Ebby'
Merge branch 'master' into Ebby