Add 2-D data to show bug
Merge branch 'master' into HPCA