created listener
Merge #11 from n3wtron
Merge branch 'n3wtron-merge' into dev