Updated Plugin with bug fixes