Issues 030 and 031
Added issue_032