Merge pull request #104 from DrJest/master

update tpl/2