commit #50 by csg