Merge pull request #1 from EllisLab/develop

Updating my Fork