Issue - #7 and #5