Issue 118: Consolidating the server roles assignment.
Merge pull request #172 from mfalesni/issue118

Issue #118