fixed & closed #23