Merging issue_23...............