Updated build configuration
Manually merged PR #116