Fix for the fix :)
Merge branch '2.1_bugfix'
Added default server address
Fixed typo