Quorafind Merge pull request #1 from Quorafind/dev