flokli Merge pull request #203 from samdoshi/find_message …