A merge commit

Loading the class