Merge pull request #1 from codennis/master

Pull Request
Merge pull request #2 from codennis/master

Pull Request
Test from Jenn
Merge pull request #2 from jedoublen/master

Pull Request