functionality completed
Need to be formatted
Merge branch 'v1.0' into v1.0_devel
print error rectified