Remaining commits.
Merge branch 'master' of https://github.com/Riqochet/tsl.git