Commit 12 - bug fixed

int and str bug fixed