Merge pull request #1 from mrwebapp/master

update
Merge pull request #2 from greenore/master

Merge pull request #1 from mrwebapp/master