Issues #8 and #9 are solved.