Merge pull request #2 from xseignard/master

Update nw build
modifs + stash
Added charset encoding