Additional master process is now optional

Merging optional extra master process feature into development branch.