Change to output on row basis
Merge branch 'master' of github.com:hpce2014/hpce_cw5 into dev
Fix merge issues