Merge #1 - Rock class added