Solved Issues #4 and #6