Testing out if I'm doing the pull request.
Merge pull request #2 from codeshi/master

Testing out if I'm doing the pull request.