stash
Merge remote-tracking branch 'origin/master'
issue #30: fix compatibility with node-webkit