solving issues #8 & #9