Fix
Merge pull request #2 from phoebus/master_t1_fix

Blablabla blablalba
Close #1