Second commit

Second commit of the master