do not emit 'arrived' twice
Merge pull request #21 from gipsy-king/master

do not emit 'arrived' twice