Add select template option
Merge pull request #1250 from voltan/develop

Add select template option