Conflict fixed.
Merge pull request #2 from exabugs/refacter

OK.