Updated to version 0.4
Final version 1.0 nearly reached