typo: "form" -> "from"
Merge pull request #46 from ajschumacher/patch-1

typo: "form" -> "from"
Merge remote-tracking branch 'upstream/master'