fixed listener issue
Merge branch 'master' of http://github.com/shaibazg/hackathon