TEST
Merge pull request #3 from blizZar/Timm

TEST