fix #22

using regexps for search