Allow server to take an argument
Allow server to take an argument
Merge remote branch 'reo/master' into crashes