Merge pull request #1 from mwsacred/master

mer