Merge New Patch
Small Change
Merge pull request #7 from jhowliu/Johnny

Merge new Patch
Modified variable name
Update so bugs
Merge branch 'jhow-dev' into Johnny

Conflicts:
	function.cpp
	function.h