Alfa 0.3

Minor changes to the code