template improvement
Merge pull request #47 from ray176/templateImprovement

template improvement