Improved version with bug fixed and cleaning-up the path