Fixed #20, closed #21