Issue #11 and 12

don't worry about "Issue #11 & #12 fixed & delete the extra head file" one, I made a mistake on that one. check "Issue #11 & #12". thanks.