Import the code written by abhishek

Import the code written by Abhishek Bhattacharjee during his Google
Summer of Code internship.