Issue: #7 & #8 Fixed.