Updates for build.
Merge pull request #2 from ska-sa/martin_build

Updates for build.