Fix to array bound bug
Merge branch 'master' of github.com:hpce2014/hpce_cw5