Merge pull request #218 from sej7278/master

Build core objects in subdirectory, fix issue #82 and fix #218