Merge pull request #1 from rogerwang/master

sync with rogerwang node-webkit [master]