Pull Request From JamesEHammond 10/23/2014

Details in the commit message. Email me if you have any questions.