Adds S13-T2 functionalities
Merge pull request #41 from Galithil/master

Adds S13-T2 functionalities