#476 Fixed &amp; bug
#476 Fixed &amp; bug. Updated plugin as we can use it on both J 2.5.x and 3.x