Commit #10 Some little changes