Changed few things and added rake file

Changed few things and added rake file