Merge pull request #1 from onfireisme/master

newly built
Merge pull request #1 from zuliang/joe

Merge pull request #1 from onfireisme/master