Added mem_size to template
Merge branch 'gmarnin-master'