Compatible with both ARC and non-ARC
Compatible with both ARC and non-ARC
Fix some issues
Merge pull request #23 from yfme/master

Support both ARC and non-ARC
Merge remote-tracking branch 'upstream/master'