* fixed strnstr issue bacsue it's BSD/OSX specific