Merge pull request #2 from Commonder/master

Merge pull request #1 from Commonder/T2
Merge pull request #3 from Commonder/T2

Merge pull request #2 from Commonder/master