updated
Merge pull request #2 from ZakWheaton/patch-2

updated