Final pull(?)

@FireDart If you think everything is OK, push the code to [tres-framework/Trestle](https://github.com/tres-framework/Trestle) at a new dev branch.