Testing pull request
Merge pull request #4 from joshbeitler/master

Testing pull request