template issue fix
fix
Merge pull request #137 from benitoro/master

template issue fix