Merge pull request #346 from barak/upstream

sed s/lenght/length/.  (You guys will be the death of me.)