Merge pull request #162 from mikeh/master

Bug fixes, separate debug & release libraries, new search option.