branch commit test
master commit
simpletest commit
Merge branch 'simpletest'

Conflicts:
	setup.py
master commit