Feature2 from Shinya

Pull request by Shinya