Added node-webkit support + small improvements