Fix server kill

Este PR resolve #18