Merge pull request #1 from OIyRobo/master

Changes from the core team