Issues #3 & #4