minor fixes
Merge branch 'master' of https://github.com/wi77/LS2
Merge branch 'master' of https://github.com/wi77/LS2