Merge pull request #1 from arax/master

Core clean-up