* added output checking
* average test altered to check output
Merge remote-tracking branch 'origin/master'