Merge pull request #139 from nurupo/experimental

Updated Core's cmake file
Fixed build