t2: only commit #1 and #3
Merge pull request #3 from maioj/development_tg1

t2: only commit #1 and #3