Merge pull request #1 from ericwhyne/master

updating local