Updated for travis testing (stringr dependency)