some modifs
Merge pull request #15 from capapas/fix_listner

some modifs