updated core
Merge pull request #206 from voisardf/buildoutcleanup

updated core