Merge pull request #293 from ni-ze/develop

[ISSUE #294]Discard data because of delay