Optimized current dev branch #34

Closed richardantao closed 4 years ago