Fixed: Makefile errors, unsigned to signed comparisons
Merge Conflict