pulling in fork changes
Updated plugin