Fixed #19 and Fixed #23