Merge pull request #1 from HackSkill/core-develop

Core develop
Added Javadoc