import changes *from* a branch
Merge pull request #260 from brandondrew/patch-1

typo fix.