optimizes
Merge branch 'master' into Going_malloc

Merging master features