Fixed CLI version to properly stop the webserver
Merge pull request #138 from r4v5/fix-cli-cleanup

Fixed CLI version to properly stop the webserver