Fixed #6 & Fixed #20