Testing fix...
small bugfix
Proper fix for server reset
Updated changelog
Merge pull request #6 from ChrisTruncer/reset_fix

Reset fix