improved grammar fixes by bookchiq, add new license
conflict merge