#98 Build script improvements

closes #98