Tauros added
Merge remote-tracking branch 'origin/master'
Merge pull request #781 from LightAdept/master

Tauros