Merge pull request #2 from brandon-carag/mod1

Mod1 merged to master