Merge pull request #323 from forki/Build

Small build improvements