Closes #338. Changed suggester module

#338