Merge pull request #105 from DrJest/master

Update tpl/1
Update submodule tpl/1
Update submodules tpl/1-2