Making the actor system configurable
Merge pull request #3159 from muuki88/master

Making the actor system configurable