Changed strnstr to strcmp wherever possible in response to ticket #30