updated
Merge pull request #4 from shawnsandy/develop-core

updated