Bug fix and better looking for zuul plugin.