Merge pull request #2 from JDCB/master

Merge pull request #3 from waynebaby/master
Merge pull request #4 from waynebaby/master

Merge pull request #2 from JDCB/master