T00004

Pull request for CIYAM Open Developers Task #T00004