Merge branch 'release/1.0.0' into develop
Fix tab-spaces
Reduce complexity of server info init method
Bump version 1.1.0
Merge branch 'release/1.1.0'