[PATCH 01/12] Changed content as per ticket #147.