Merge pull request #37 from chrislimsv/beta

fixed timeout issue with find/add