Merge branch 'SampleBranch'

Conflicts:
	nim.py