Saved servers improved
Merge origin/master