Build matrix

re #464