Proper restart
Merge pull request #23 from korczis/devel

Proper restart