1.3.9 added search function