Updated dependencies. Updated code style.
Added missing inheritance of option from #47 and da058a7
added cleaner naming of internal listener arguments