Merge pull request #1 from cowboy1122/dev

little m