merger some upstream changes from vibou and update README