Merge pull request #1 from mwsacred/master

mer
Merge pull request #2 from mwsacred/master2

Merge pull request #1 from mwsacred/master