resolve conflict
Merge pull request #16 from tt185581/teimo

resolve conflict