Bug fixing + Version 0.0.2