listener added
fixed spritzer stop
Merge branch 'master' into Dorota