Added stuff for TIG
Merge branch 'master' into netbook