Resolving parameterized value in server and username
Merge Issue #14 branch