second try
Merge branch 'master' of github.com:johnychee/aesoft