Fixed server stopping and fixed a bug in link measurements
Merge pull request #299 from dswd/fix-server-stop

Fixed server stopping and fixed a bug in link measurements