Merge pull request #4 from TCB-Developers/dev

Dev
code cleanup
Merge pull request #5 from TCB-Developers/master

is this right?