Add actor class by Ando
Merge origin/master