V1.0.1 - Bug fixing