Resolve Issue#65 and #66