Iss36

Iss36 complete. Ready for merge