Fixed my assigned issues

Fixed issues #9 and #13