change
Merge pull request #14 from jaredentin/master

change