No network crash :bug: fix
Merge pull request #6 from taesiri/master

:bug: fixes