Fixed Some issues and released v2.0.2