Fixed a bug with multinode support.
Merge remote-tracking branch 'jesse/feature/multinode' into feature/multinodes-mode