commit #49 by csg