Merge pull request #1 from loopj/master

update to the newest