Fix issue #59

third attempt
Merge pull request #62 from sattellite/patch-2

This patch fixes only one situation when 'complete' event was called.
If 'complete' event don't called then on next call it don't work.
Merge pull request #1 from dixso/develop

Update fork