Modified and updated some code (v0.1.4.a22)