Solution1 of #36 implemented. Fix #36. Fix #37.