Fix some bugs
Fix
Merge pull request #135 from if045/KM-tech

Km tech