closed #66, closed #103