core 2
Merge pull request #38 from rinkalvictor/master

core 2