cleanup, bugfixing
Merge branch 'master' of https://github.com/scdo1020/WI_SWA.git