Merge pull request #5 from pamval/master

core-refactor merge