Correct TWI bugs and tested
.
.Merge branch 'master' of github.com:skapin/dev