M1 commit
Merge pull request #1 from JeffZ2013/M1

Merge M1 to master