Merge pull request #40 from DrJest/master

Update Submodule 1,2
Update submodule tpl/1