Merge branch 'master' of https://github.com/khoa-nd/TechLooper
Merge commit '841e7de77f9b2060fd7c86496ca0da1c06512ec5'
Merge commit 'b2d1fb1635e7b0243b896b1b969000f603f24c24'
Fix term-name issue
Merge commit '2545473b240ef42e3642982c72f6c3002ab8e475'