Fixed Issues #8 and #9