Merge pull request #19 from takabayashi/develop

Fix make commands inside the templates