Build improvments

 7bbb9db - Closes #35