Merge pull request #235 from retro-wertz/core_fixes