Changed size from int to unsigned int
Merge remote-tracking branch 'origin/master'