Fixed bug and added new feature for chrome plugin