Add CreateCore fixes fixes issue #87
Merge pull request #88 from ewilde/ewilde-87-createatlocation

Add CreateCore fixes fixes issue #87