patched with beta
secure server
merged changes from development branch