Optimize, better handling, no DDoS
Cleaning
Merge branch 'feature/optimize' into develop
Merge branch 'release/2.0'