Closes #1 - Searches now work for comments too.