fixed NaN on startup
Merge branch 'master' into each_net_zoom2