Added lines to test Issues #7 and #10 to the code, added description to the Wiki