C4
Merge branch 'iss53'

Conflicts:
	testProject/ViewController.m
C6
Update ViewController.m

c7
Merge branch 'master' into iss53

Conflicts:
	testProject/ViewController.m