Fixed #13 and added search