Fix #37. Improve build.