Update to master
Merge pull request #19 from alexcrichton/update

Update to master