@Author Tim Smith

*Multiple changes made to test program