commit before merging to super master branch
Fixing merge conflict with kevin/refactor branch