Remove string.h dependencies
Merge remote branch 'origin'