Merge branch 'master' of github.com:tkido/tohobbs
refactoring valide functions
update template