commit by john
Merge pull request #1 from johnyi23/master

commit by john