[GH-9] Update core files changed upstream
Merge pull request #10 from tokengeek/update_core_files

[GH-9] Update core files changed upstream