Update to incoming
Merge pull request #1 from huonw/master

Update to latest incoming