Fixed #66 & Fixed #61