Build improvements

Closes #69.