Issue #11 & #12 fixed & delete the extra head file