Solved Issues #7 and #8