Updated with ES 0.90.6 version of plugin
fixed merge issues