Removed .orig files.
Code corrected and sync. with upstream repo.