Fixed image size bug, iOS static library
Merge remote-tracking branch 'origin/master'