Merge pull request #150 from stephenhouser/1.x

Move "@synthesize nameUsedToInstantiate" inside #ifdef