TZI: Update
Merge pull request #4 from ok100/master

[Merge] TZI: Update merged into master