Pull in changes from upstream

Hello @huckphin, 

Please review the following commits I made in branch 'dpup-upstream'.

45afeccd9e9d5312f706d99d5d1f1181debb6b52 (2013-11-08 01:03:25 +0100)
fix shadowed err bug

f9e6f462b251b9effcdfe45eab9ebbb21be558c2 (2013-04-03 14:32:16 -0500)
Update README.md

R=@huckphin