Changeset 22 added. See Ticket #112