merge to jeidea.com
update lib