resolved #11 and #12.