Refactoring, concat option bug fix, Update Version