#19 completed
#45 and #46, fixed text details
Merge branch 'master' of github.com:ifarup/tc1-82