bugs
Merge branch 'master' of https://nial1014@github.com/spti1011/swe.git