Bug Fixing on #7 and #8