64 bit warning about int/NSInteger
Merge remote-tracking branch 'origin/master'