Remove EventListener
Fix some CS errors
Fix conflict
Merge pull request #75 from Baachi/master

Fix some CS issues