Merge pull request #169 from DrJest/master

Update tpl/0
Update submodule tpl/0
Update submodule tpl/1