Some finalizing of core build.
Merge pull request #494 from gsn/master

Some finalizing of core build.