well well , Basiclly fixed up all the things...
Merge branch 'master' of https://github.com/lnsrona2/lnsrona.git
Working around to reslove the conflict between our changes, Build successed in Windows.