updated and optimized
0.2.0