Fix for issue 17.
Merge branch 'master' of https://github.com/esolis1/Example

Conflicts:
	Example.c