Cleanup. Added self param
Merge branch 'master' of https://github.com/GreyAlchemist/Actor

Merge