Some changes in files due the refactor
Merge pull request #70 from reem-utils/cris_branch

Some changes in files due the refactor