Merge pull request #3 from jvelasques/core-refactor

2988 - Endpoints now provide an answer with an appropriate content-type.