clean up
Merge remote-tracking branch 'id02/master'
Use synchronisation instead of polling