template issue
Merge pull request #44 from yenbryan/peterdev

template issue