Merge branch 'release/0.2.1' into develop
Split server configuration
Bump to 0.2.2
Merge branch 'release/0.2.2'