Fixed #78 Scaffold templates improvement