updates for changes to core
Merge pull request #14 from mrkrstphr/core-updates

updates for changes to core