Merge pull request #1 from ericwhyne/master

updating local
Merge pull request #81 from tmycann/master

Merge pull request #1 from ericwhyne/master