resolved #51 and #50