Merge pull request #4 from koo04/master

Fixed issues with server not shutting down and more