Improved the build matrix.
Merge pull request #19 from thedrow/patch-2

Improved the build matrix.