Merge remote-tracking branch 'origin/master'
Fix listener
Fix project.properties