Merge pull request #1 from kraih/master

Follow Mojo