Changes made by esolis1
Merge remote-tracking branch 'origin'

Conflicts:
	Example.c