Merging changes from Mr_okushama