Feature/fix 4

Fixed https://github.com/bedirhan/wivet/issues/4