#8 Fixes updates to servers
Fixed issues #6 and #8