merged
Merge branch 'master' of https://github.com/amonszpart/KinfuSuperRes
yang adjusted
yang fixed