working on my actor and fixed one bug
Merge remote-tracking branch 'origin/master'