M5 Update
Merge pull request #31 from sjklein92/m5

M5 Update