C3
C4
C5
Merge branch 'iss53'

Conflicts:
	readme.txt