name change
Merge pull request #1 from dustinlapierre/master

name change