step 1
done
done
Merge branch 'master' into render
Merge branch 'master' into computation
fix awful performance
Merge branch 'render'