a lot of changes
Merge branch 'master' of github.com:h2oloopan/alke