Use NSUInteger instead of int (silence warnings)
Merge remote-tracking branch 'camelpunch/master'