Feature/git listener

I'm going to merge this with master