Build matrix improvenents.
Merge pull request #51 from thedrow/patch-1

Build matrix improvenents