optimizations
Merge branch 'master' of https://github.com/xdenser/nw-f2cwa-play