Fixed #33 & Fixed #31