fix error with sizeof(name)
Merge branch 'Development'