v 1.2

SahebDa, u merge and push to me..