Rotor class
Merged with master