Bug fixing on version 0.4