Addressed Issues #3 & #15