Iss17 and Iss18

Resolved